From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 26 Aug 2011 05:05:13 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~845^2~67
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd;p=emacs.git

Merge from trunk.
---

fcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd